Fix numpy header detection
authorStuart Prescott <stuart@debian.org>
Sat, 15 Feb 2025 14:27:09 +0000 (01:27 +1100)
committerStuart Prescott <stuart@debian.org>
Wed, 7 May 2025 13:59:19 +0000 (23:59 +1000)
Existing code makes assumptions about site-packages/dist-packages
and fails to find the headers; numpy has an explicit function for this

Gbp-Pq: Name 0005-Fix-numpy-header-detection.patch

build_scripts/utils.py

index 29f2545d08dd864f99b95c573fec8fd38b685279..d5c1063e1994c1c30ba94dce7fd0de4900cec2fb 100644 (file)
@@ -77,17 +77,8 @@ def update_env_path(newpaths):
 
 
 def get_numpy_location():
-    for p in sys.path:
-        if 'site-' in p:
-            numpy = Path(p).resolve() / 'numpy'
-            if numpy.is_dir():
-                candidate = numpy / '_core' / 'include'  # Version 2
-                if not candidate.is_dir():
-                    candidate = numpy / 'core' / 'include'  # Version 1
-                if candidate.is_dir():
-                    return os.fspath(candidate)
-                log.warning(f"Cannot find numpy include dir under {numpy}")
-    return None
+    import numpy
+    return numpy.get_include()
 
 
 def platform_cmake_options(as_tuple_list=False):